Merge branch 'master' into martin-t/damagetext 391/head
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 24 Feb 2017 17:14:13 +0000 (18:14 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 24 Feb 2017 17:14:13 +0000 (18:14 +0100)

Trivial merge