Squashed '.makefiles/' changes from b20982c..a75ba69
a75ba69 Merge branch 'meaningcloud' into 'master' 919c4a0 Update base.mk 42224e3 Updated makefiles from meaningcloud f0c211c PYVERSION changed 24d85b1 Merge branch 'meaningcloud' into 'master' d150321 Updated makefiles from meaningcloud 4f88009 Merge branch 'senpy' into 'master' 1f0703d Fixed typo in .gitlab-ci c23f798 Trying to fix push to github git-subtree-dir: .makefiles git-subtree-split: a75ba6994d93ca027b6f3ba0b08b75dd60d3aa78