Now trying to extract merges in a way which is also compatible with svn
version 1.6.17 and newer.
Authored by: henca 2013-12-27
Parent: [r15]
Child: [r17]
