Merge remote-tracking branch 'upstream/beta' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 18 Nov 2015 12:19:51 +0000 (13:19 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 18 Nov 2015 12:19:51 +0000 (13:19 +0100)

Trivial merge