disable 3D simulations
Merge branch 'master' into mac