Merge pull request #511 from ndawe/master

[MRG] interactive.wait: handle default TCanvas