Redirect controller added (plus minor fixes)
Merge branch 'minimal' into rest