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)
commit7b79216c5463a025554d9bbc7e4f1fc150742b52
treef5a9b5ab01c61ba152aaacacb845fde47f99bfd6
parenta41f85d3241919b94a9eca38fd7029d32218d524
parent35d7211bfae981c8299345928ab2905c17782ab9
Merge branch 'master' into blender2.8

Conflicts:
intern/locale/boost_locale_wrapper.cpp