Conflicts resolved
authormorsch <andreas.morsch@cern.ch>
Tue, 14 Oct 2014 06:52:55 +0000 (08:52 +0200)
committermorsch <andreas.morsch@cern.ch>
Tue, 14 Oct 2014 06:52:55 +0000 (08:52 +0200)

Trivial merge