Noting the MIT licence in the gemfile.
Merge branch 'v1' into v2
Merge remote-tracking branch 'upstream/v2'