pulled in fixes from the master branch.