Upgrade to ember rc6