Merge remote-tracking branch 'remotes/upstream/multiSelect' into multiSelect
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 30 Sep 2015 16:42:17 +0000 (18:42 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 30 Sep 2015 16:42:17 +0000 (18:42 +0200)

Trivial merge