Merge

Forcing a correct Subversion branch merge despite tree conflicts
2016-11-23 11:01 subversion merge