Merge "Make get_partitions() work for partitioned disks"