correcy MIT license
Merge branch 'master' into grunt0.4
Keep state of grunt0.4 to override master