Multisite bug fix.
Merge branch 'master' of github.com:uweb/uw-2014 into dane