Merge branch 'hotfix/redirect'
Merge branch 'develop'
Cosmetic
Fixed bug in error handling discovered by Eric while trying to debug something else (#229)
Fix for helping Johannes Weberhofer package w3af as RPM