fixed error introduced by last commit
Merge branch 'master' into CAPER