Preparing for npmification
Merge branch 'master' into legacy