this.over didn't do what I thought it did
Merge branch 'master' into gh-pages