Merged of devel for 1.1.2 release