Sync'd branch releases/aurora with upstream @ Thu Oct 16 08:16:44 PDT 2014