Merge development branch into master in preparation for a release