Merge branch 'graphing'
Merge branch 'master' of https://github.com/ldevesine/Calvin into john_dev