This change has been merged. Previous status: Conditionally approved For details, see: http://bundlebuggy.aaronbentley.com/request/%3C1214373717.1536.62.camel%40lifeless-64%3E