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