Merge commit 'ca8d7eb5ce81efd9d7b38c57bde123041c12de0b' into CMSSW_7_3_X