Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:58:32 +0000 (17:58 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:58:32 +0000 (17:58 +0100)

Trivial merge