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