Merge branch 'upstream/master'
updated some missing files
core updates
Merge pull request #1 from rossquigley/master

changes to core