Add the magic words "in plain English" to make things clearer.
Merge branch 'dev' into gh-pages