rdar://problem/25870571
Created attachment 282005 [details] Patch
Committed revision 202436.
Re-opened since this is blocked by bug 159190