Merge branch 'release-v1.6.1' into devel
caa_meta: better treatmner of '-' variable names
c_caa_var_get: bug fix, crashed when requesting unit and dataobject was not there
Merge branch 'devel'