Revert "Merge branch 'master' of https://github.com/Fritsen/02312_CDIO3"

This reverts commit 0fb9cec0da0c7add3029efa967c1cb9e8d0ff4da, reversing
changes made to d5c622e676fe1dd08a0d8a73f5f8ff7f46bf30ec.
Revert "Revert "Merge branch 'master' of https://github.com/Fritsen/02312_CDIO3""

This reverts commit 0d00a73eb5c260debf2e195d48ed51b97e7f360b.