Merge pull request #412 from peternewman/e1.37-2

Tidy up some license stuff.