diff --git a/images/terrain/flag-neutral-first_watch.png b/images/terrain/flag-neutral-first_watch.png
new file mode 100644
index 00000000000..9920f66a20d
Binary files /dev/null and b/images/terrain/flag-neutral-first_watch.png differ
diff --git a/src/editor/editor.cpp b/src/editor/editor.cpp
index c3b826fbf7e..6c27a4d51e2 100644
--- a/src/editor/editor.cpp
+++ b/src/editor/editor.cpp
@@ -81,6 +81,12 @@ int main(int argc, char** argv)
 
 	const font::manager font_manager;
 
+	std::vector<std::string> terrain_names;
+	const std::vector<gamemap::TERRAIN> terrains = map.get_terrain_precedence();
+	for(std::vector<gamemap::TERRAIN>::const_iterator t = terrains.begin(); t != terrains.end(); ++t) {
+		terrain_names.push_back(map.terrain_name(*t));
+	}
+
 	std::cerr << "starting for(;;)\n";
 	for(;;) {
 		if(key[SDLK_ESCAPE])