# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1457904888 -3600
# Node ID aa58ff8b654381e5f8130e0af16f1009b9f0cba1
# Parent  768bf62890f893570c1e5579eb4d44c1f8951470# Parent  3c21e70972bc64b21315420d568c1532e9396847
Merge from stable-2