Bugfix
Merge branch 'master' into node-webkit