3.3/master

You may want to put this on a 3.3 branch :)