Syncing some items with jwiki.  Note that this does not compile
patches for newest updates to jwiki