Merge branch '1.0'

Authored by mlaurent on Aug 19 2019, 12:00 PM.

Description

Merge branch '1.0'

Merged Changes

CommitAuthorDetailsCommitted
b007f28b1e81mlaurent
Fix bug found by david 
Aug 19 2019