Fix for bug when second color in the legend can not be edited
Merge remote-tracking branch 'auz34/master'