Adding missing files that were hidden by gitignore
Merge remote-tracking branch 'upstream/master'