Merge pull request #826 from jmaas/master

Shebang fixes to binaries in bin/