closes #61
Merge branch 'b61-fix-cloudinit' into devel