Merge pull request #3224 from totten/4.4-image-url-idx