dimmer support
Merge branch 'dimmer-support'