Initial GS Dev
Merge branch 'master' into GordonDev.