master
Do modern exceptions after conflicts resolved
[SIMULATION] py2/3 compatibility:drop use of __future__
Snapshot of CMSSW_6_2_0_pre8.