Merge branch 'issue-75' into 'release-3.0'