Fix warning about flet deprecation, using cl-flet when it's available.
Merge remote-tracking branch 'upstream/master'