Allow braces in bind()
Merge origin/master