Sync'd branch releases/aurora with upstream @ Mon Aug 25 11:55:39 PDT 2014