Gonna try a slightly different branching strategy.
Merge branch 'master' of https://github.com/mmparker/tbdiag