EXPERIMENTALLY build 3.3.1 snapshot

This pull is just to get your buildbot to test this snapshot on various OSX versions. Please do not merge it.