Merged (by hand) pull request from crackcomm.