Merge branch 'devel'
Merge branch 'devel'
fix errors from meteor packaging publish