Merged r10385:10413 from michaelld/swig_tweaks into trunk. Passes distcheck.