Sync'd branch releases/aurora with upstream @ Wed Nov  5 19:46:41 PST 2014