re #606 - Avoiding CSS @import
Merge branch 'refs/heads/master' into feature/606-import
re #607 - Specified missing image dimensions
re #607 - Specified missing image dimensions
re #607 - Specified missing image dimensions
Merge branch 'refs/heads/feature/607-dimensions'