Merge current working copy updated for glFusion 1.4.0