Merge pull request #2988 from octo/ff/struct-init-syntax