Merge branch 'devel'
authorMarek Marecki <marekjm@ozro.pw>
Sun, 23 Apr 2017 12:28:22 +0000 (14:28 +0200)
committerMarek Marecki <marekjm@ozro.pw>
Sun, 23 Apr 2017 12:28:22 +0000 (14:28 +0200)

Trivial merge