Switched to Apache 2.0 license.
Silly.
Merge branch 'master'