Sync'd branch releases/aurora with upstream @ Thu Sep 18 19:46:34 PDT 2014