Thanks bmispelon. Backport of f71fdf83a8 from master
Thanks Jan Murre, Reinout van Rees and Wim Feijen, plus Remco Wendt for reviewing. Backport of i6c730da1f from master.
Thanks James Pic. Backport of c32fc79aa1 from master