Merge pull request #1037 from gavinandresen/addmultisigenable