Develop

Merge of 1.2.0, see the changelog.