Cherry pick commits from hotfix on master

The README stuff isn't relevant, nor are the built scripts per-se, but these two commits are relevant to  devel as well as master. See #55 (bug report and discussion) and #56 (PR with hotfix for master branch).