Merging devel into master for the 1.2 release