Merge pull request #2772 from rubenk/static-initializers