Merged from trunk.

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7515 8c9fc860-2736-0410-a75d-ab315db34111