Merge pull request #41 from colincoghill/master

Series of bugfixes since 3.9.2 release
Merge pull request #42 from colincoghill/release/3.9.2

Merge pull request #41 from colincoghill/master