Updated for v1.3.1
Merge branch 'master' into production