Another paragraph from mycollab
Merge branch 'upstream'; deal with conflict in ReadMe