Merge branch 'esegev'
Forgot some colons in footer
Merge branch 'master' into esegev