license information
Merge branch 'master' into historysupport