Small change for compiler backward compat
Merge branch 'master' into develop