Merge remote-tracking branch 'upstream/master' into inetmanet-2.2

Conflicts:
	src/networklayer/manetrouting/olsr/ChangeLog