[pull] master from vanhauser-thc:master#9

pull[bot] merged 2 commits intofr34k8:masterfr34k8/thc-hydra:masterfrom

vanhauser-thc:mastervanhauser-thc/thc-hydra:masterCopy head branch name to clipboard