Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 8 Dec 2017 13:39:17 +0000 (14:39 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 8 Dec 2017 13:39:17 +0000 (14:39 +0100)
commit087997f9ebcb90724120d736b885d5d7834f9e0f
treea541d538f375c52b61703b86dc598af55506f293
parentd46305f7413f394a0b424662d816c96723b5e5bb
parentc7ee64b2d9939336135cda1a56623701d6345186
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_templates.c