Merge branch 'master' into mm17555-final

components/recent_date.tsx

@@ -2,14 +2,18 @@
 // See LICENSE.txt for license information.
 
 import React from 'react';
-import {FormattedMessage} from 'react-intl';
+import {
+ FormattedMessage,
+ injectIntl,
+ IntlShape,
+} from 'react-intl';
 import moment from 'moment-timezone';
 
 type Props = {
  timeZone?: string;
  value: number | Date;
  children?(val: string): React.ReactElement | null;
- intl: any; // TODO This needs to be replaced with IntlShape once react-intl is upgraded
+ intl: IntlShape;
 }
 
 class RecentDate extends React.PureComponent<Props> {