Merge branch 'master' of https://github.com/wesnoth/wesnoth-old

src/persist_context.cpp

@@ -141,6 +141,9 @@ bool persist_file_context::clear_var(const std::string &global, bool immediate)
 	while ((active->empty()) && (!namespace_.lineage_.empty())) {
 		name_space prev = namespace_.prev();
 		active = get_node(cfg_, prev);
+		/// @todo: This assertion replaces a seg fault. Still need to fix the
+		/// real bug (documented as bug #21093).
+		assert(active != NULL);
 		active->clear_children(namespace_.node_);
 		if (active->has_child("variables") && active->child("variables").empty()) {
 			active->clear_children("variables");

utils/pofix.py

@@ -130,7 +130,7 @@ if __name__ == '__main__':
         statinfo = os.stat(path)
         if statinfo.st_mtime > timecheck:
             newer += 1
-    files.append(path)
+        files.append(path)
     modified = sum(parallel_map(process_file, files))
     print ("pofix: %d files processed, %d files modified, %d files newer" \
           % (pocount, modified, newer))