Sync'd branch releases/aurora with upstream @ Wed Nov  5 14:48:35 PST 2014