UI synch issues.

.NET UI thread pedantry is annoying.
Merge remote-tracking branch 'origin/master' into dev