Bugfix for the new embedder script
Merge remote-tracking branch 'origin/master' into c++0x