Merged with upstream master

Updates to many major files
Merge branch 'develop'