diff --git a/.gitattributes b/.gitattributes
index 9e9a0f8..5635875 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -38,37 +38,22 @@ Makefile	text eol=lf encoding=utf-8
 
 # Force binary files to be binary
 
-###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-#*.cs	  diff=csharp
+*.webp	binary
+*.gif	binary
+*.jpg	binary
+*.png	binary
+*.pdf	binary
+*.doc	binary
+*.DOC	binary
+*.docx	binary
+*.DOCX	binary
+*.dot	binary
+*.DOT	binary
+*.PDF	binary
+*.rtf	binary
+*.RTF	binary
+
 
-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
-###############################################################################
-#*.sln		 merge=binary
-#*.csproj	 merge=binary
-#*.vbproj	 merge=binary
-#*.vcxproj	 merge=binary
-#*.vcproj	 merge=binary
-#*.dbproj	 merge=binary
-#*.fsproj	 merge=binary
-#*.lsproj	 merge=binary
-#*.wixproj	 merge=binary
-#*.modelproj merge=binary
-#*.sqlproj	 merge=binary
-#*.wwaproj	 merge=binary
 ###############################################################################
 # diff behavior for common document formats
 #
diff --git a/mpir b/mpir
index 230d8be..c7f9435 160000
--- a/mpir
+++ b/mpir
@@ -1 +1 @@
-Subproject commit 230d8bee7bcad4c36a380a14e5bd19fb8071f18d
+Subproject commit c7f9435392ede4c7f2c887a44d7a9ca7d724f4dc