Merge branch 'terencehill/keyhunt' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 3 Jan 2017 01:34:31 +0000 (01:34 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 3 Jan 2017 01:34:31 +0000 (01:34 +0000)
Keyhunt improvements

Closes #1843 and #1837

See merge request !402


Trivial merge