Fix file descriptor leaks
Merge branch 'testing' into fix/fd-leak
Merge pull request #534 from nyuszika7h/fix/fd-leak

Fix file descriptor leaks
Fix previous merge.
Fix previous merge (again).
log: Add support for Logging's 'extra' keyword argument
Merge pull request #535 from bnrubin/master

log: Add support for Logging's 'extra' keyword argument
add short options to getopts. single letter options will work with both - or --
Merge pull request #536 from ddan39/addshortopts

add short options to getopts. single letter options will work with both - or --
Merge branch 'master' into testing