Fixes scalatra/scalatra#419
Merge pull request #420 from nilskp/2.3.x_2.10

Fixes scalatra/scalatra#419
Merge branch '2.3.x_2.10' of https://github.com/scalatra/scalatra into 2.3.x_2.10