Branch 1.1.x (currently 1.1.1-SNAPSHOT): fixes-only