Change license to Non-Commercial. Old work will be available under the old license in their respective branches.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into gotham_test