Merge 1.1.a into 1.1

Time to retire this side branch