Merge remote-tracking branch 'upstream/master'
authorphilsmd <philsmd@hashcat.net>
Sun, 3 Jan 2016 18:56:23 +0000 (19:56 +0100)
committerphilsmd <philsmd@hashcat.net>
Sun, 3 Jan 2016 18:56:23 +0000 (19:56 +0100)

Trivial merge