Merge 3.3.1 into master