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