Merge remote-tracking branch 'origin/master' into leap_master
authorvarac <varacanero@zeromail.org>
Fri, 13 Jan 2017 11:41:58 +0000 (12:41 +0100)
committervarac <varacanero@zeromail.org>
Fri, 13 Jan 2017 11:41:58 +0000 (12:41 +0100)

Trivial merge