Merge branch 'IB/CMSSW_7_1_X/debug-gcc491' into IB/CMSSW_7_2_X/debug