Merge branch 'rjtm' into feature-daemon
Merge branch 'feature-daemon' of github.com:RJTM/moosejs into feature-daemon