Merge branch 'devel' into bartek. Fixed conflicts in paramread.F and CMakeLists.txt