[Bf-blender-cvs] [08ad6e5] strand_gpu: Merge branch 'master' into strand_gpu

[Lukas Tönne]

Commit: 08ad6e5ad687a5fb0b8645a507cf4e6b84cc94a3
Author: Lukas Tönne
Date:   Sat Jul 9 09:01:50 2016 +0200
Branches: strand_gpu
https://developer.blender.org/rB08ad6e5ad687a5fb0b8645a507cf4e6b84cc94a3

Merge branch 'master' into strand_gpu

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



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