Fix wrong merge

Fixes #683.
Merge remote-tracking branch 'hwi/master'