Updating bsp-utils.js to match master.