Whoops, ranges include their ends!
Merge branch 'master' into gh-pages