Merge branch 'master' into split-buffer

Conflicts:
	core/net/ipv6/sicslowpan.c