Fix pipette tool not getting accurate color, fixes #821.
Merge remote-tracking branch 'origin/master'