Auto completion adds closing brackets twice

Since the 4.7 release (I think, not entirely sure when it started, but it's here for the latest few versions) the C++ code completion has a very annoying issue.

Typing this:

    if () {
    } else {

Will propose to automatically add the closing bracket upon pressing enter. However, doing so, it will add two of them and also break indentation. You'll end up with:

    if () {
    } else {

}}

instead of the expected outcome of:

    if () {
    } else {

    }