fix for #446
Merge branch '2.x' into 2.6
update