Merge branch 'Nofre-master'
authorAndrew Karpow <andy@ndyk.de>
Sun, 20 Sep 2015 14:01:06 +0000 (16:01 +0200)
committerAndrew Karpow <andy@ndyk.de>
Sun, 20 Sep 2015 14:01:06 +0000 (16:01 +0200)

Trivial merge