Sync'd branch releases/aurora with upstream @ Mon Aug 25 07:19:34 PDT 2014