Not sure how this got updated :(
Merge branch '1.10' into 1.11
Versions: hard?
Merge branch '1.11'