Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 17 Mar 2017 10:00:41 +0000 (11:00 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 17 Mar 2017 10:00:41 +0000 (11:00 +0100)
commit722451e146d08c1db44ee1265518795684831184
tree84b5e498cbce1cbca1f3e775810162a09f47f876
parenta8c7152eea6ff0250a2cdd79964bce8b581d2914
parenta58350b07f4c848f3d424a0505791245b444ea64
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenloader/intern/writefile.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_add.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c