also test with ember 1.6.1
Merge branch 'master' into next