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

Trivial merge