Port PR #168 to 7.2.X

Port PR #168 to 7.2.X, simply by merging.