Another para from Karl
Merge branch 'upstream'; deal with conflict in ReadMe