Merge remote-tracking branch 'upstream/beta' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 2 Nov 2015 19:10:21 +0000 (20:10 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 2 Nov 2015 19:10:21 +0000 (20:10 +0100)

Trivial merge