Merge branch 'gh76' into 3.x