last update / cache buster
Merge branch 'master' into gh-pages