Merge branch 'master' into topic/unified-method-generation-w-xs

Conflicts:
	mop.c

diff --cc lib/Class/MOP.pm
Simple merge

diff --cc lib/Class/MOP/Class.pm
Simple merge

diff --cc mop.c
Simple merge

diff --cc xs/MOP.xs
Simple merge