Simplify PAGE-URL's around method.
There's no such thing as single-site.rc anymore.
Merge branch 'master' into experimental