Merge branch 'beta'
3.0_01

changed the build paths, and some names in preperation for final
release. Minor changes implemented. So minor, that it isn't worth
bothering a re-release.
Merge branch 'master' into beta