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