Merge tag 'v3.4.100' into kk4.4

This is the 3.4.100 stable release

Conflicts:
	Makefile

Change-Id: Iff7496cbcc27ba14ab19c6f4ed57ea6e6484fdb6