Moved over latest changes from other projects
Merge remote-tracking branch 'upstream/master'