1.0.13
Merge branch 'master' into gh-pages