Make responsive images optional
Merge branch 'feature/responsive'