Some new and updated files
Merge branch 'master' into Shane