Development merge into master

This is the first merge from the development branch into master.