Some logging when things go wrong.
Merge branch 'master' into gh-pages