merge develop into master#87
Merged
guillaumedebavelaere merged 5 commits intomasterfrom developJan 18, 2018
+47-8
Commits
Commits on Jan 18, 2018
- committedguillaumedebavelaere
- committedguillaumedebavelaere
- committedguillaumedebavelaere
- authoredguillaumedebavelaere
- authoredguillaumedebavelaere