Merge branch 'master' of bitbucket.org:nemo32/snf-occi