Don't display field value in tooltip. Closes #941
Merge remote branch 'upstream/master'