Merging devel into master for 1.1.1 release