small fix to avoid warning
Merge branch 'master' into develop