Merge remote-tracking branch 'origin/add_philips_hue_support'
Merge remote-tracking branch 'origin/add_philips_hue_support'
Merge remote-tracking branch 'origin/add_philips_hue_support'
Merge remote-tracking branch 'origin/master'