cec
Merge branch 'master' into edison