the backwards apostrophe was being too aggressive
Merge branch 'master' into gh-pages