Merge pull request #560 from ndawe/master

[MRG] use keepalive in Legend.AddEntry