Fixed bug where invisible buttons would still register input
Merge remote-tracking branch 'tom/master'
Merge remote-tracking branch 'jw/master'
forgot to commit script