VERSION updated
Merge branch 'devel'