Pending commit to add case of Christoph at 2011-08-19 and remove ticket_17 (which has self-intersections)