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