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