Sync'd branch releases/aurora with upstream @ Thu Sep  4 07:07:31 PDT 2014