PR: ports/169509 Submitted by: Pierre David <pdagog@gmail.com>, Jean Benoit <jean@unistra.fr> Feature safe: yes