Closes #531: adds better redirect messages.
Merge commit '2c8e29fd50b37ba4c35d2f8bd3a1e3366596df0c' into HEAD