Merge remote-tracking branch 'origin/5.4'

Authored by dfaure on Dec 1 2019, 2:54 AM.

Description

Merge remote-tracking branch 'origin/5.4'

Merged Changes

CommitAuthorDetailsCommitted
2c3626955cd4D25639dfaure
Fix compilation error with gcc 7.4.1, ambiguous overload 
Nov 30 2019
3d2ff6f3e43edakon
remove bad assert 
Nov 27 2019