line changes - no code
Merge remote-tracking branch 'origin/master'

Conflicts:
	ZoomableCanvas/VirtualPanel.cs