Merge branch 'master' into esegev
Tons of changes
Merge branch 'esegev'