better error messages
Merge remote-tracking branch 'origin/master' into feature/enterprise_activate_sound_zone