Merge branch 'ticket/13683' into ticket/13683-3.2.x

* ticket/13683:
  [ticket/13683] Fix CS
This commit is contained in:
Tristan Darricau 2016-04-03 16:27:08 +02:00
commit 02469d4691