Merge branch 'dev'
Imgur Content Provider now always returns https:// links
Serve non-https images via imgur