add missing include of <stdexcept>
Merge branch 'master' into vim