Update sir-trevor.js to Master