Allow proc for static_navigation url parameter
Merge branch 'xss'