changed variable name for doxygen
Merge branch 'concurrency' of github.com:jgressier/typhon into concurrency