Merge branch 'release/3.1.1-2' into develop
Fixes for meteor 0.8.0
Increment version
Merge branch 'release/v3.1.1-3'