[Bf-blender-cvs] [c95f31f] blender-tiles: Merge remote-tracking branch 'blender-upstream/master' into blender-tiles

[Jeroen Bakker]

Commit: c95f31f8319131d6f69bf02fb7ae6e5256ecb178
Author: Jeroen Bakker
Date:   Mon Aug 4 21:36:53 2014 +0200
Branches: blender-tiles
https://developer.blender.org/rBc95f31f8319131d6f69bf02fb7ae6e5256ecb178

Merge remote-tracking branch 'blender-upstream/master' into blender-tiles

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



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