Merge branch 'framework'

Conflicts:
	src/syslog_h.erl