get carried by logs
Merge branch 'master' into gh-pages