Update master to work on stable/icehouse