More secure defaults
Updating default routes in new app template
Merge remote-tracking branch 'upstream/master'