Merge commit 'b34385ec924b6067c1f82bdbae923f8062518956'
authorClifford Wolf <clifford@clifford.at>
Fri, 11 Mar 2016 10:10:44 +0000 (11:10 +0100)
committerClifford Wolf <clifford@clifford.at>
Fri, 11 Mar 2016 10:10:44 +0000 (11:10 +0100)

Trivial merge