Update to explain the correct place of this functionality
Merge branch 'Galixte-patch-2'