backport of support for inline media resizing
Merge branch 'v7' of github.com:phpwax/wildfire into v7