(refs #551)Adjust wiki buttons
Merge remote-tracking branch 'upstream/master'