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