Merge remote-tracking branch 'remotes/upstream/1193_uploader_layout' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 20 Nov 2015 17:36:50 +0000 (18:36 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 20 Nov 2015 17:36:50 +0000 (18:36 +0100)

Trivial merge