Merge branch 'master' into devel
Merge branch 'devel' of https://github.com/aldeed/meteor-simple-schema into devel