Sync'd branch releases/aurora with upstream @ Thu Oct 23 11:51:42 PDT 2014