moved/renamed stuff
Merge remote-tracking branch 'origin/ralph/develop' into howard/develop