This change has been merged. Previous status: Conditionally approved For details, see: http://bundlebuggy.aaronbentley.com/request/%3C4889296C.5050308%40canonical.com%3E