merge swig changes from fedoraproject

These patches fix apol