Conflict on feature revert for _kayak and _family. Testing Travis with those two reverts disabled.