Update from si-imac.home.simonszu.de (Do 27 Jun 2013 18:19:34 CEST)
Fixed merge conflicts