1b6aee1515
Merge commit '2a3188672ab2b65c0ce7c9c598a463e382c47696' * commit '2a3188672ab2b65c0ce7c9c598a463e382c47696': rename a few files to camel-case, add copyright notices