# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1437589086 14400
# Node ID 29daabe094fe3e0d78f53095042106d6d34324f9
# Parent  e395bffe1412c11be65592a0752df69e51f73b95# Parent  a37c565f4b684e874060e522f0fdd9508d1f26ae
merged from stable