Version bump.
Version bump
Merge branch 'master' into circular-clocks