# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1462822391 14400
# Node ID a34ec862371fc053078d6e87b5b63f6bbc1fb481
# Parent  0a05883216cf1dc303a22a1735d7bb0fb48b53ce# Parent  8eb8a6bd70e8a2442a05e59fb167d9628ee0a50b
merged with dev branch