woops, somehow managed to fail to merge the stuff from the DAE branch (changeset 702 to 819) into the trunk. This should correct that.