Merge development into master for 1.3.0 release