Merge branch 'release/2014-08-13' into develop
Attempt to fix a weird bug that crashes Safari in some cases. See http://stackoverflow.com/questions/25194444/meteor-crashing-safari
Merge branch 'release/2014-08-15'