Merge newest whistle.js