Merge remote-tracking branch 'remotes/upstream/streaming' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 1 Nov 2015 08:16:55 +0000 (09:16 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 1 Nov 2015 08:16:55 +0000 (09:16 +0100)

Trivial merge