Fixed a replace
Fixed a replace
Merge branch 'master' into kingman