Reorder if clauses to get rid of "Unknown template variable `responsive_image_class` in namespace" error
Merge branch 'master' into github_master