Fix for 5.2.  Still works with live.
Added tag 3.38 for changeset a7c4463dc37c