moved over commit 204ecdc from dev branch
copied over commit eaf281d from dev branch
Merge branch 'master' into dev