Merge branch 'master' into release

Synchronize the master branch with the release branch to prevent that the
master branch is ahead by single merge commits. Allows future tags to be
fast-forwarded when reintegrated into the master branch.

Author: mtf90