Merge branch 'spray-can' of https://github.com/alexbiehl/Play20 into spray-can
Merge branch 'spray-can' of https://github.com/alexbiehl/Play20 into spray-can