upgrade versions
Merge branch 'master' into project