Merge branch 'release-0.36' into develop
Bugfix and minor code cleanup.
Bumped version number to 0.37 and update CHANGES file.
Merge branch 'release-0.37'