Fix dangling paren
Merge branch 'master' into vc14