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