baking out for snow simulation
Merge remote branch 'upstream/master'