License change from MIT to Apache v2.0
Merge branch 'master' into H/Parser