Merging r278904:

------------------------------------------------------------------------
r278904 | marshall | 2016-08-16 22:58:40 -0700 (Tue, 16 Aug 2016) | 1 line

Support allocators with explicit conversion constructors. Fixes bug #29000
------------------------------------------------------------------------

llvm-svn: 279015