log tests and implemetation
Merge remote-tracking branch 'origin/1.x' into 1.x

Conflicts:
	tests/log_tests.js