updates from master for dollars.js