Merge remote-tracking branch 'remotes/upstream/material_buttons' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:21:20 +0000 (18:21 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:21:20 +0000 (18:21 +0100)

Trivial merge