Change button text to tooltip
Merge branch 'release/20140602'