STDCXX-552 and subtasks

[Travis Vitek]

Farid,

Could you please review and commit the patches mentioned at the bottom
of STDCXX-552? It is a blocker for 4.2.0 and the patches have been
sitting for a week. I'd like to get it and its subtasks resolved and
closed ASAP.

Travis