Fix so non-inline images aren't skipped on forward (#1489150)

Conflicts:

	CHANGELOG