Merging fix for #26