Merge remote-tracking branch 'shared/master' into leap_master master
authorvarac <varacanero@zeromail.org>
Wed, 16 Mar 2016 21:03:36 +0000 (22:03 +0100)
committervarac <varacanero@zeromail.org>
Wed, 16 Mar 2016 21:03:36 +0000 (22:03 +0100)

Trivial merge