Merge pull request #1644 from shackbarth/license