merged upstream MEEGPIPE
Merge branch 'master' into NewDataLayer