[MERGE] fix crass malfait

Signed-off-by: David Goulet <dgoulet@efficios.com>