.
Merge branch 'develop' of github.com:theraphim/scala-dispatcher into develop