diff --git a/.gitignore b/.gitignore
index 816bc0ec9..ddd8581a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ tests/python_tests/raster_colorizer_test.png
 tests/python_tests/raster_colorizer_test_save.xml
 utils/mapnik-config/mapnik-config
 utils/shapeindex/shapeindex
+utils/mapnik-index/mapnik-index
 utils/ogrindex/ogrindex
 utils/pgsql2sqlite/pgsql2sqlite
 utils/svg2png/svg2png
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ead70c40..5f92ddf61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ Released: YYYY XX, 2015
 
 #### Summary
 
+- CSV plugin has been further optimized and has gained experimental support for on-disk indexes (#3089)
+- SVG parser now fallsback to using `viewbox` if explicit dimensions are lacking (#3081)
 - Visual tests: new command line arguments `--agg`, `--cairo`, `--svg`, `--grid` for selecting renderers (https://github.com/mapnik/mapnik/pull/3074)
 - Visual tests: new command line argument `--scale-factor` or abbreviated `-s` for setting scale factor (https://github.com/mapnik/mapnik/pull/3074)
 - Fixed parsing colors in hexadecimal notation (https://github.com/mapnik/mapnik/pull/3075)
diff --git a/SConstruct b/SConstruct
index 3cde6c21f..047456132 100644
--- a/SConstruct
+++ b/SConstruct
@@ -400,7 +400,7 @@ opts.AddVariables(
     BoolVariable('DEMO', 'Compile demo c++ application', 'True'),
     BoolVariable('PGSQL2SQLITE', 'Compile and install a utility to convert postgres tables to sqlite', 'False'),
     BoolVariable('SHAPEINDEX', 'Compile and install a utility to generate shapefile indexes in the custom format (.index) Mapnik supports', 'True'),
-    BoolVariable('CSVINDEX', 'Compile and install a utility to generate CSV file indexes in the custom format (.index) Mapnik supports', 'True'),
+    BoolVariable('MAPNIK_INDEX', 'Compile and install a utility to generate file indexes for CSV and GeoJSON in the custom format (.index) Mapnik supports', 'True'),
     BoolVariable('SVG2PNG', 'Compile and install a utility to generate render an svg file to a png on the command line', 'False'),
     BoolVariable('NIK2IMG', 'Compile and install a utility to generate render a map to an image', 'True'),
     BoolVariable('COLOR_PRINT', 'Print build status information in color', 'True'),
@@ -1964,8 +1964,8 @@ if not HELP_REQUESTED:
 	if 'boost_program_options%s' % env['BOOST_APPEND'] in env['LIBS']:
 	    if env['SHAPEINDEX']:
 		SConscript('utils/shapeindex/build.py')
-	    if env['CSVINDEX']:
-		SConscript('utils/csvindex/build.py')
+	    if env['MAPNIK_INDEX']:
+		SConscript('utils/mapnik-index/build.py')
 	    # Build the pgsql2psqlite app if requested
 	    if env['PGSQL2SQLITE']:
 		SConscript('utils/pgsql2sqlite/build.py')
diff --git a/utils/csvindex/build.py b/utils/mapnik-index/build.py
similarity index 85%
rename from utils/csvindex/build.py
rename to utils/mapnik-index/build.py
index ddaba2681..02258caed 100644
--- a/utils/csvindex/build.py
+++ b/utils/mapnik-index/build.py
@@ -29,7 +29,7 @@ program_env = env.Clone()
 
 source = Split(
     """
-    csvindex.cpp
+    mapnik-index.cpp
     """
     )
 
@@ -48,12 +48,12 @@ if env['RUNTIME_LINK'] == 'static':
     if env['PLATFORM'] == 'Linux':
         libraries.append('dl')
 
-csvindex = program_env.Program('csvindex', source, CPPPATH=headers, LIBS=libraries)
+mapnik_index = program_env.Program('mapnik-index', source, CPPPATH=headers, LIBS=libraries)
 
-Depends(csvindex, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
+Depends(mapnik_index, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
 
 if 'uninstall' not in COMMAND_LINE_TARGETS:
-    env.Install(os.path.join(env['INSTALL_PREFIX'],'bin'), csvindex)
+    env.Install(os.path.join(env['INSTALL_PREFIX'],'bin'), mapnik_index)
     env.Alias('install', os.path.join(env['INSTALL_PREFIX'],'bin'))
 
-env['create_uninstall_target'](env, os.path.join(env['INSTALL_PREFIX'],'bin','csvindex'))
+env['create_uninstall_target'](env, os.path.join(env['INSTALL_PREFIX'],'bin','mapnik-index'))
diff --git a/utils/csvindex/csvindex.cpp b/utils/mapnik-index/mapnik-index.cpp
similarity index 100%
rename from utils/csvindex/csvindex.cpp
rename to utils/mapnik-index/mapnik-index.cpp