Merge pull request #821 from mikeller/add_rateprofile_support_to_msp