Merge branch '3.6-release' master
authorfabrixxm <fabrix.xm@gmail.com>
Fri, 23 Mar 2018 10:27:10 +0000 (11:27 +0100)
committerfabrixxm <fabrix.xm@gmail.com>
Fri, 23 Mar 2018 10:40:22 +0000 (11:40 +0100)
To fix wrong merge of 3.6-rc


Trivial merge