Merge branch 'devel' into devel_feedback2
Merge remote-tracking branch 'origin/devel_feedback2' into devel
Merge branch 'devel' of https://github.com/SixAppeal/wpi-suite into devel