Merge branch 'master' into dev/T7014

Authored by dvratil on Aug 8 2018, 7:25 PM.

Description

Merge branch 'master' into dev/T7014

Merged Changes

CommitAuthorDetailsCommitted
c39e856650f1mlaurent
Wierd it was not increased 
Aug 8 2018