Fix broken enabling of electric pair mode (fixes #190)
Merge remote-tracking branch 'upstream/master'