Merge commit '151a70ae311b91d9941de27eb1dec38929162e02'

Conflicts:
	NMSMaterialDecay/include/NMSPrimaryUserInformation.hh
	NMSMaterialDecay/src/NMSPrimaryUserInformation.cc