Merged latest master changes to unstable.
authorJanusz Dobrowolski <janusz@frontaccounting.eu>
Mon, 15 Jan 2018 11:55:36 +0000 (12:55 +0100)
committerJanusz Dobrowolski <janusz@frontaccounting.eu>
Mon, 15 Jan 2018 11:55:36 +0000 (12:55 +0100)

Trivial merge