Merge pull request #5681 from neheb/sispmctl