Auto detection of existing VirtualBox partition
Merge branch 'develop'