Merged fix from Github master
Release 2.6.2