Merge pull request #351 from jpecht/master

definition change / unhighlight fix