Fix Error.log
Merge remote-tracking branch 'origin/master'

Conflicts:
	system/logs/error.log