Merge commit 'refs/pull/17/head' of https://github.com/BlueBrain/codash