Merge remote-tracking branch 'remotes/upstream/target_marshmallow' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:45:04 +0000 (17:45 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:45:04 +0000 (17:45 +0100)

Trivial merge