listing 5-19

Avoiding duplicate entries for color by extending the event handler
Merge branch '5.6'