Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 25 Sep 2015 15:23:31 +0000 (17:23 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 25 Sep 2015 15:23:31 +0000 (17:23 +0200)

Trivial merge