incorporating subsequent fixes in master