Thread:FranceSwitzerland/@comment-32547201-20171001165547/@comment-31425337-20171007000950

I added the updates along with my own 1.5

WHY IS THERE AN EDIT CONFLICT?

TUM what did you do?