Version 3.5

Consider it a halfway point. We’ll do a merge to bring version 4 up to
date.