- merge changes with ardor3D head.