removed srcdev
Merge branch 'master' into connecttous