Apply patch 5. This is mostly collapsed as a null change since the head has the fixes for techview (removing techview from the path name).

(binary:image/x-portable-bitmap)