Cherry pick change to url matching regular expression. Fixes LMS-37

@nedbat @brianhw: Please review?

https://github.com/edx/django-wiki/compare/e2e84558...ac906abe