fix bug left in last commit
Merge branch 'master' into deploy