Merge remote-tracking branch 'upstream/master' into merge_master ...

# Conflicts:
#	test/run-unittest.sh

replace all usages of `exit` ...

- those skipped the ERR trap
- add die function to exit with line number and message

unify flags and error handling ...

- also add trap ERR handler to report exact error location