Fixed #936
Merge branch 'master' into release-options