K 10
svn:author
V 5
danfe
K 8
svn:date
V 27
2018-01-15T18:42:10.490861Z
K 7
svn:log
V 135
Unbreak the build against new Clang version 6.0.0 (due to the same nature
of the changes, should've been part of r459108).

PR:	224989

END