feature #538: Changes using the new split function.
Merge branch 'master' of git.opennebula.org:one