Changes made to this submodule since naadsm 'last_common_ancestor' was written have now been incorporated.