Fixed #1104.
Merge branch 'master' into production