Fixed conflicts
Merge branch 'marty'
Merge branch 'master' into Dustin