Merge branch 'master' into Cole
resolve Conflict
Merge branch 'Cole'