Merge branch 'terencehill/ka_fixes' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 27 Jul 2015 16:22:28 +0000 (16:22 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 27 Jul 2015 16:22:28 +0000 (16:22 +0000)
Keepaway fixes

See merge request !147


Trivial merge