Merge tag 'upstream/24.2'
authorJoachim Wiedorn <joodebian@joonet.de>
Sun, 22 Nov 2015 00:41:18 +0000 (01:41 +0100)
committerJoachim Wiedorn <joodebian@joonet.de>
Sun, 22 Nov 2015 00:41:18 +0000 (01:41 +0100)
Upstream version 24.2


Trivial merge