pulled in fixes from master