Sync'd branch releases/aurora with upstream @ Thu Oct 23 05:58:40 PDT 2014