Sync'd branch releases/aurora with upstream @ Thu Sep 18 07:30:42 PDT 2014