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