Add widget help text to setup page
Merge remote-tracking branch 'upstream/master'