Merge pull request #2881 from mattip/fninit