Probe configs
Merge branch 'develop' of github.com:errkk/wsp_control into develop

* 'develop' of github.com:errkk/wsp_control:
  Trying to be too clever with the dict comprehension