remove c++0x
Merge branch 'release_electric'