update version num
Merge branch 'master' into 2.1