Merge branch '0.2'

tools/amalgamate.py

@@ -69,8 +69,9 @@ for fname in args.inputs:
             guard_res = guard_re.match(line)
             if not inc_res and not guard_res:
                 file.write(line)
-                # Ensure file is written to disk.
-                file.flush()
+        # Ensure file is written to disk.
+        file.flush()
+        os.fsync(file.fileno())
         print ("done."),
 
 if not is_c: