Apply our local changes bringing us up to 3.95 (for which there is no
release tar), and add build glue.

import send-pr from gnats-3.2