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