fixed loading or routes on winservice, thanks Stephen Tanner
fixed issue 1443, automenu for wiki, thanks Alan
faster labels, thanks Anthony
Merge with upstream.