Merge remote-tracking branch 'upstream/master'
authorphilsmd <philsmd@hashcat.net>
Sat, 14 May 2016 17:47:23 +0000 (19:47 +0200)
committerphilsmd <philsmd@hashcat.net>
Sat, 14 May 2016 17:47:23 +0000 (19:47 +0200)

Trivial merge