Merge in trunk. Updates to manual/update to latest libtest.