Wiki controller tweaks.
Merge branch '3.0'