K 10
svn:author
V 5
riggs
K 8
svn:date
V 27
2015-11-22T20:11:52.388598Z
K 7
svn:log
V 123
Update to upstream version 2.1.1

PR:		203607
Submitted by:	xxjack12xx@gmail.com
Reviewed by:	yuri@rawbw.com, koobs, riggs

END