Merge last changes from Matt

This is the last difference to the repo that wasn't merged in from the codebase on GH maintained by Matt. Libtool looks innocuous, but I don't know the knock-on effects of this change alone.

assigned to @sjr20