Update for 1.1.0.x

Ok, I thought it was included in the patch itself, just misread a diff of a diff file ;)