getting back to DanCooper
Merge branch '1.3.0.x' of https://github.com/msavazzi/Ember-MM into 1.3.0.x