merge

forcing this to be included is causing issues for some OS X folks