Merge branch 'rjmcdonald83-ui_changes'
Merge branch 'master' into ui_changes