Getting rid of src sub-dir
Merge branch 'master' into trusty/snapshot