Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

src/components/views/elements/InfoTooltip.tsx

@@ -81,8 +81,8 @@ export default class InfoTooltip extends React.PureComponent<ITooltipProps, ISta
                 className={classNames("mx_InfoTooltip", className)}
             >
                 <span className={classNames("mx_InfoTooltip_icon", iconClassName)} aria-label={title} />
-                {children}
-                {tip}
+                { children }
+                { tip }
             </div>
         );
     }