merge from hue master