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