[Bf-blender-cvs] [5c706c6] temp_display_optimization: Merge branch 'master' into temp_display_optimization

[Julian Eisel]

Commit: 5c706c6496d2701282b6cd40154676c67b409cd5
Author: Julian Eisel
Date:   Mon Apr 18 21:15:47 2016 +0200
Branches: temp_display_optimization
https://developer.blender.org/rB5c706c6496d2701282b6cd40154676c67b409cd5

Merge branch 'master' into temp_display_optimization

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



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