minor fix
Merge branch 'master' into matei-dev