Revert "maj"

This reverts commit f5245c084dc2b7ff1231273cf85da5fcc28fd469.
maj
Merge branch 'devel'