Merge remote-tracking branch 'remotes/upstream/master' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 08:36:06 +0000 (09:36 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 08:36:06 +0000 (09:36 +0100)

Trivial merge