SWC-1383 and SWC-1387
Merge pull request #969 from jay-hodgson/button-link-widget

SWC-1383 and SWC-1387