More wor on Ember port.
Merge branch 'master' into emberjs