3.3.0 Use img OR src, now optional
Merge remote-tracking branch 'origin/experimental'