Merge branch 'release/0.4.0-b22'

* release/0.4.0-b22:
  correct Makefile
  Minor bump to version 0.4.0-b22
version label update

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
Patch bump to version 0.4.1-b26

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
Merge branch 'release/0.4.1-b26' into production

* release/0.4.1-b26:
  Patch bump to version 0.4.1-b26
  version label update