trying to fix race condition
Merge branch 'master' into gh-pages