Sync and fix ogre-merge for ember.