Merge remote-tracking branch 'upstream/develop' into new_branch_21_09_2018

This commit is contained in:
Philippe GRAND 2018-09-21 15:06:53 +02:00
commit 1690ed86a7