Merging last minute changes from 1.1.1 release