Merge branch 'master' into 7-localization
authorMauro Scomparin <scompo@gmail.com>
Tue, 10 Jul 2018 18:57:36 +0000 (20:57 +0200)
committerMauro Scomparin <scompo@gmail.com>
Tue, 10 Jul 2018 18:57:36 +0000 (20:57 +0200)

Trivial merge