emberjs/ember.js — pull request #4904 by rjackson (2014-05-20 14:15:01+00:00)
Title: Ensure that options is normalized before setting flag.

This fixes failing tests in Safari (since it will not allow you to set
additional keys on a string).

Thanks to @machty for tracking this down.