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