Merge branch 'master' into John
typo when fixing conflict

typo when fixing conflict
Merge branch 'John'