Merging FT's C++03 Fixes