Changelog and License File
Merge commit '303f96999575fbe985746fab3a7269c182cfe4b5'