Merge remote-tracking branch 'origin/master'

Conflicts:
	CompressedImageView/MainWindow.xaml
	CompressedImageView/MainWindow.xaml.cs