Proper fix for #235
Merge branch 'master' into otr