Dev

This is a pull request from dev into trunk - the problems with these, is that they end up creating the new commit, and not doing