Merge "Update mrstub with nginx"