Merged CMSSW_7_1_X from repository shervin86