K 10
svn:author
V 6
adridg
K 8
svn:date
V 27
2018-01-22T09:20:05.281295Z
K 7
svn:log
V 166
Fix up the patch from r459623 with a newer upstream commit. One extra
nullptr check had gotten lost along the way. Upstream 8969b3735a.

Approved by:	rakuco (mentor)

END