TextButton Performance +1
Merge remote-tracking branch 'pmprog/master'