Merging 2.2.11 master changes. Enough of this!