Testing vobject 3.1
Merge branch '1.7' into 1.8