[Bf-blender-cvs] [97ee7f8] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 97ee7f8609bed555ff4bd371b7e25d13b2d6a0d6
Author: Bastien Montagne
Date:   Wed Jun 22 13:12:44 2016 +0200
Branches: blender2.8
https://developer.blender.org/rB97ee7f8609bed555ff4bd371b7e25d13b2d6a0d6

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenloader/intern/readfile.c
	source/blender/editors/physics/particle_edit.c

===================================================================



===================================================================