Merge branch 'devel' into merge
-rw-r--r-- 22 NEWS
-rw-r--r-- 19 README