merge
authorJan Szejko <janek37@gmail.com>
Wed, 14 Sep 2016 10:54:00 +0000 (12:54 +0200)
committerJan Szejko <janek37@gmail.com>
Wed, 14 Sep 2016 10:54:00 +0000 (12:54 +0200)

Trivial merge