Fixed #1090.
Merge branch 'master' into feature/defaults