root: sync changes from stable branch
Merge pull request #583 from smuzaffar/IB/CMSSW_7_1_X/devel

root: sync changes from stable branch