Inline image resources
Merge branch 'master' into inlined-img