K 10
svn:author
V 3
mat
K 8
svn:date
V 27
2017-01-03T18:33:19.329334Z
K 7
svn:log
V 140
Make sure the merge is done on the latest branch.

Also, make the branch argument optional.

Discussed with:	swills
Sponsored by:	Absolight

END