Merge branch '1.3.0.x' of https://github.com/DanCooper/Ember-MM into 1.3.0.x
Merge remote-tracking branch 'upstream/1.3.0.x' into 1.3.0.x