Merge github_GBSX/master

KoenHerten · KoenHerten · commit c881f605c5aa · 2016-08-19T11:33:54.000+02:00
Conflicts:
	README.md
diff --git a/README.md b/README.md
@@ -270,4 +270,4 @@ v1.2
 
 v1.3
  * Removal of the filelock class, ReentrantLock is now used
- * The demultiplexing is now multithreaded: use -t NumberOfThreads
+ * The demultiplexing is now multithreaded: use -t NumberOfThreads
