Merge commit '5360f08' into 3.6
authorFabio <f.comuni@creative-group.it>
Fri, 23 Mar 2018 10:10:00 +0000 (11:10 +0100)
committerFabio <f.comuni@creative-group.it>
Fri, 23 Mar 2018 10:10:00 +0000 (11:10 +0100)

Trivial merge