Did the needful for disabled buttons to support tooltips.
Merge remote-tracking branch 'upstream/master'