a few fixes to Tristram.js
Merge remote-tracking branch 'origin/CORE15' into pr