Merge commit '6ef1959fa479fe25a25b6c03fd63a6a2e8e779e3'

# By John Capone
# Via John Capone
* commit '6ef1959fa479fe25a25b6c03fd63a6a2e8e779e3':
  C0 and C1 ratdisp and ratdisp_calib lists are now by filter name, not camera name.
Merge commit 'a0ee0e3f9f51246c4764e2c4bf83369de182f74f'

* commit 'a0ee0e3f9f51246c4764e2c4bf83369de182f74f':