same problem from #10 cropping up in a different place
Merge branch 'master' into gh-pages