Latest Core
Version 1.9.5.5
Merge commit 'a99ffd30b8b3b4346cc53db045db1961adb84e69' into lechnology

Conflicts:
	core