Merge pull request #1403 from reaperhulk/backport-license

backport license fix to 0.6.x