Sync'd branch releases/aurora with upstream @ Thu Sep  4 09:15:23 PDT 2014