Sync'd branch releases/aurora with upstream @ Thu Oct 30 07:24:35 PDT 2014