bring tulip up-to-date (includes my own patches!)