Fix `separate` for grayscale images (fixes #212)
Merge remote-tracking branch 'upstream/master'