user submitted via api
Merge branch 'master' of github.com:remy/mit-license
user submitted via api
fixed conflict