K 10
svn:author
V 3
des
K 8
svn:date
V 27
2015-04-26T11:33:01.663624Z
K 7
svn:log
V 142
Merge upstream r3375 and r3376 which fix a segfault on startup when the
user specified in the configuration file does not exist.

PR:		197534

END