Added support for tags for buttons
Fixed python unit test
Resolving merge conflicts
Yeah, thanks git
Merge remote-tracking branch 'upstream/master' into 533_tags
And I mean that as sarcastically as possible
Merge pull request #1210 from AdmiralJota/533_tags

Added support for tags for buttons