GDAL 2.0.0 Python bindings won't compile with SWIG 3.0.6

[jcrepetto]

make -C swig/python generate 
make: Entering directory '/home/jcr/gdal/swig/python'
swig -Wall -I../include -I../include/python -I../include/python/docs -outdir "osgeo"   -I/home/jcr/gdal -c++ -python -o extensions/gdal_wrap.cpp ../include/gdal.i
swig -Wall -I../include -I../include/python -I../include/python/docs -outdir "osgeo"   -I/home/jcr/gdal -python -o extensions/gdalconst_wrap.c ../include/gdalconst.i
swig -Wall -I../include -I../include/python -I../include/python/docs -outdir "osgeo"   -I/home/jcr/gdal -c++ -python -o extensions/ogr_wrap.cpp ../include/ogr.i
../include/python/ogr_python.i:115: Error: Line indented less than expected (line 25 of pythoncode)
../include/python/ogr_python.i:115: Error: Line indented less than expected (line 26 of pythoncode)
../include/python/ogr_python.i:115: Error: Line indented less than expected (line 27 of pythoncode)
../include/python/ogr_python.i:194: Error: Line indented less than expected (line 23 of pythoncode)
../include/python/ogr_python.i:194: Error: Line indented less than expected (line 24 of pythoncode)
../SWIGmake.base:15: recipe for target 'ogr_wrap.cpp' failed
make: *** [ogr_wrap.cpp] Error 5
make: Leaving directory '/home/jcr/gdal/swig/python'

[Even Rouault]

trunk r29549, branches/2.0 r29550 "Python bindings: fix build with SWIG 3.0.6 (#6045)"

[Even Rouault]

branches/1.11 r30442 "Python bindings: fix build with SWIG 3.0.6 (#6045)"