rebase?
Merge branch 'dev' of https://github.com/rogeralsing/akka.net into dev