Merge branch 'master' into develop
Fix --version bug pointed out by sysrqb.
Merge branch 'release-0.1.3'