PHP 5.6 should no longer be optional for sabredav 1.8
Lets see if we can add vobject 3 to the build matrix like this.
Missing fi;
Space
missing e.
Merge branch '1.8' of github.com:fruux/sabre-dav into 1.8
Merge branch '1.8' into 2.0

Conflicts:
	.travis.yml
	ChangeLog
Merge branch '2.0'