Sync'd branch releases/aurora with upstream @ Thu Aug 28 14:56:31 PDT 2014