Fixing check for valid channels to handle both Channels and ChannelsExtended
merge dev_5_0 -D org: PR 70 (Allow passing extra channel rendering options to Make_Movie script)
merge dev_5_0 -D org: PR 71 (Kymograph analysis march 12th (rebased onto dev_5_0))
merge dev_5_0 -D org

Repository: ome/scripts
Already up-to-date.

Merged PRs:
  # PR 70 cneves 'Allow passing extra channel rendering options to Make_Movie script'
  # PR 71 will-moore 'Kymograph analysis march 12th (rebased onto dev_5_0)'

Generated by OMERO-5.0-merge-daily#622 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-daily/622/)