Sync'd branch releases/aurora with upstream @ Thu Oct 30 11:56:34 PDT 2014