fix funny chars
Merge commit '264376435b8aac47b808a287d13250523df65e9a' into 2014-11-06-Zurich