Update to 5.2.0

Applied https://gist.github.com/philacs/cf6bec6b72211aa27f0d