Merge branch 'master' into develop
(To make versioning work properly for the develop branch, since currently the v0.8.0 tag only exists in the master branch. This merge will pull the v0.8.0 tagged commit into the develop branch too.)
This commit is contained in: