Fish several times for the stub
Merge branch 'master' of https://github.com/SJakobsen/DIM3-Team-M
Merge branch 'master' of https://github.com/SJakobsen/DIM3-Team-M