cms-sw/cmssw — pull request #5608 by mark-grimes (2014-09-29 11:33:19+00:00)
Title: Pull request #5430 with merge conflicts resolved

See #5430.