.
Merge remote-tracking branch 'origin/master'

Conflicts:
	locale/en/locale.cfg
	prototypes/item.lua