Merge remote-tracking branch 'meskio/feature/6210_key_newer' into develop
authordrebs <drebs@leap.se>
Mon, 10 Nov 2014 18:18:17 +0000 (16:18 -0200)
committerdrebs <drebs@leap.se>
Mon, 10 Nov 2014 18:18:17 +0000 (16:18 -0200)

Trivial merge