Something to do with button text and other things. Whee.
Merge remote-tracking branch 'origin/master'