No need to keep track of state in this way
typo
Fixes to show diffs again!
Merge branch 'master' into gh-pages
rebuild