# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1464728843 14400
# Node ID c5f98916297edef000a19d9e7d25bfa248a34a77
# Parent  a34ec862371fc053078d6e87b5b63f6bbc1fb481# Parent  2cade72d75ad95eda3d4de19113aca2621975120
merged with dev branch