Sync'd branch releases/aurora with upstream @ Thu Oct 30 06:04:41 PDT 2014