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