# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1488885652 -3600
# Node ID 18574b79e422d886ee88b72bb31ff873556fd0c8
# Parent  3b63f8b1c2246cfbaed1cf1ef78a54b6243fdcee# Parent  ef6e0eaae6c120bf69ab62405a658f4b999539d9
Merge from stable-2