Merge "Walk up tree to find makefiles in mma"