do not release doc/ amd example/ bak files
Merge remote-tracking branch 'origin/master' into p2

Fixed conflicts:
	Makefile