Sync with upstream 3.16 branch #32

The default branch for this project is based on an older 3.15 branch. It would be good to update it to a newer version so we can be sure things haven't broken with various build system changes that have happened.

I guess we'll also want to rename the branch to a 3.16- prefix to match our targeted version :)