# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1437878199 14400
# Node ID a05f79c74d6d9c33282061f80176510182532906
# Parent  29daabe094fe3e0d78f53095042106d6d34324f9# Parent  d6c69d3d09e572a203ea68df8d96c50e90291d39
merged default with dev