Prevent classification to go beyond IPv4 header for IP fragments
Merge remote-tracking branch 'origin/devel-0.5' into devel-0.6

Conflicts:
	CHANGES