Merge remote-tracking branch 'shared/master' into leap_master
authorvarac <varacanero@zeromail.org>
Wed, 24 Feb 2016 08:18:31 +0000 (09:18 +0100)
committervarac <varacanero@zeromail.org>
Wed, 24 Feb 2016 08:18:31 +0000 (09:18 +0100)

Trivial merge