Merge cherry pick from solution
Merge branch 'master' of github.com:arild/akka-workshop