Eventually we're moving upwards – the right way…
Merge branch 'master' into gh-pages