Merge commit '27dfb3070adc90ddfcc398a352de1741f52add03' * commit '27dfb3070adc90ddfcc398a352de1741f52add03': Replaced deprecated calls to setButton and setButton2
Merge commit '27dfb3070adc90ddfcc398a352de1741f52add03' * commit '27dfb3070adc90ddfcc398a352de1741f52add03': Replaced deprecated calls to setButton and setButton2