changes to master
Merge branch 'master' into release2_basicgittest