Sync'd branch releases/aurora with upstream @ Thu Oct 30 13:25:42 PDT 2014