Sync'd branch releases/aurora with upstream @ Thu Sep 11 20:58:30 PDT 2014