Merge pull request #311 from discourse/image-update