Merge Euan's fix for debian, regenerate OASIS