Merge branch 'raysmond'
Merge branch 'master' into raysmond