Sync'd branch releases/aurora with upstream @ Wed Sep  3 08:51:32 PDT 2014