Merge pull request #4305 from daverodgman/development_new

Merge development onto development_3.0