Merge pull request #3154 from lambdageek/fix-initmessage-linker