fix vignette highlighting bug
Merge branch 'release-master' into release-1.2