Changes for 3.3 that work!
Merge branch '3.3/master'