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)
commitf0a82d2bc29ba96f21d97d1c04956389ef6d7b90
tree4c7e42dd6566967cf5199ad4f0b0bc7a3768673a
parent2e26588db4cc38b689e67e331b7a2ba2caa9531a
parent95a1e639a1173f5d850914de2bd66f6c26eb0065
Merge branch 'terencehill/keyhunt' into 'master'

Keyhunt improvements

Closes #1843 and #1837

See merge request !402