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

Fixes scalatra/scalatra#419