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