Fork: Scalatra contribution