Release 1.1.0
Changes for #2460 were left behind for release 1.1.0