Merge remote-tracking branch 'origin/nick' into frank

inabox.wpf/ImageUtils.cs

@@ -799,6 +799,7 @@ namespace InABox.WPF
             grid.Children.Add(img);
 
             var txt = new System.Windows.Controls.TextBox();
+            txt.IsEnabled = false;
             txt.Text = caption;
             txt.BorderThickness = new Thickness(0);
             txt.TextWrapping = TextWrapping.WrapWithOverflow;