Merge pull request #2033 from jwillemsen/jwi-ACE_TEMPLATES_REQUIRE_SOURCE