RC for 3.3
Merge pull request #1136 from tobiasd/33rc

RC for 3.3