Imported Upstream version 5.2
Merge tag 'upstream/5.2'

Upstream version 5.2
New upstream release