merging...
xMerge branch 'master' of https://github.com/alexsuse/continuous
just keeping stuff