Fix.
Merge remote-tracking branch 'GitHub/dev'

Conflicts:
	TLM/MainWindow.xaml
	TLM/MainWindow.xaml.cs