Merge branch 'master' into v4

Conflicts:
	qcmsint.h
diff --git a/iccread.c b/iccread.c
index e1c9c9a..36b7011 100644
--- a/iccread.c
+++ b/iccread.c
@@ -1188,3 +1188,17 @@
 	}
 	return profile;
 }
+
+#ifdef _WIN32
+/* Unicode path version */
+qcms_profile* qcms_profile_from_unicode_path(const wchar_t *path)
+{
+	qcms_profile *profile = NULL;
+	FILE *file = _wfopen(path, L"rb");
+	if (file) {
+		profile = qcms_profile_from_file(file);
+		fclose(file);
+	}
+	return profile;
+}
+#endif