xwen: resolve merge conflicts with dev
Merge branch 'dev' of github.com:pelferina/wpi-suite into feature-testCases