Fixes to the pull requests.
making buttontext unselectable
Merge remote-tracking branch 'upstream/devel' into devel