NOJIRA: use 'public image service' to serve images, eliminating need to reauthenticate.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'