Fixed issue #88: Merge into 6.0
Fixed issue #88: Merge into 6.0