Merge branch 'develop' into 'master'.

After this merge, branch 'develop' can be deleted.