Merge branch 'zdf'(fixes #8024)
authorremitamine <remitamine@gmail.com>
Mon, 28 Dec 2015 16:54:04 +0000 (17:54 +0100)
committerremitamine <remitamine@gmail.com>
Mon, 28 Dec 2015 16:54:04 +0000 (17:54 +0100)

Trivial merge