Oops, left part of a merge comment in the build.
Oops, left part of a merge comment in the build.

lzpfmh/scalatra,lloydmeta/scalatra,Alefas/Scalatra,offner/scalatra,Alefas/Scalatra,lightvector/scalatra,0xfaded/scalatra,dozed/scalatra,lzpfmh/scalatra,lloydmeta/scalatra,0xfaded/scalatra,Alefas/Scalatra,seratch/scalatra,offner/scalatra,lzpfmh/scalatra,dozed/scalatra,lightvector/scalatra,seratch/scalatra,dozed/scalatra,lightvector/scalatra,seratch/scalatra,offner/scalatra