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