Manual merge with branch pg93, includes new build system from commit 9c6a12ae8de2a83fd0e109ff17945388a9bec621.