Added support for auto-licensing
Merge remote-tracking branch 'origin/master'