Do not insert ')', '}' or ']' if next char

is one of them
Merge branch 'refs/heads/develop' into develop2