Merge development into master

No need to keep these branches separate any longer.