Merge branch 'v0.16.x'

Conflicts:
	src/player_thread.c

1 files changed, 1 insertions, 1 deletions

diff --git a/src/uri.h b/src/uri.h
index 85eeebe2..5a9b472f 100644
--- a/src/uri.h
+++ b/src/uri.h
@@ -25,7 +25,7 @@
 #include <stdbool.h>
 
 /**
- * Checks whether the specified URI has a schema in the form
+ * Checks whether the specified URI has a scheme in the form
  * "scheme://".
  */
 G_GNUC_PURE