properly handle per-feed hide_images setting in three panel mode (closes #706)
Merge remote-tracking branch 'upstream/master'