Jbide 13212

putting a pull request to master for now. If it looks good, maybe i can beg beg beg for 4.0