Revert to dfb8770e6a
Merge branch 'master' into wip-1.2.0-merge
Merge pull request #128 from neocotic/wip-1.2.0-merge

Merge master into wip-1.2.0