-
Merge remote-tracking branch 'origin/master'

Conflicts:
	3.14zd3c.userprefs
	Library/CurrentLayout.dwlt