Merge pull request #255 from annando/1502-pledgie-deactivated