Merge "Button needs a simple mechanism to set text label" into devel/master