Include missing header files in distribution tarball.
Merge branch 'master' into prerelease-0.4