Pull changes from bitbucket.
Sync and fix ogre-merge for ember.