Merge branch 'develop'
Merge branch 'master' into develop
Fix a NRE
Merge branch 'hotfix_0.3.1'
Merge branch 'master' into develop