Backport the changes made to the MVC sample to the Nancy sample