Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 24 Oct 2018 06:26:32 +0000 (08:26 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 24 Oct 2018 06:26:32 +0000 (08:26 +0200)
Conflicts:
intern/locale/boost_locale_wrapper.cpp


Trivial merge