Merge branch 'master' into 7-localization
authorMauro Scomparin <scompo@gmail.com>
Tue, 10 Jul 2018 19:07:12 +0000 (21:07 +0200)
committerMauro Scomparin <scompo@gmail.com>
Tue, 10 Jul 2018 19:07:12 +0000 (21:07 +0200)

Trivial merge