[Bf-blender-cvs] [dbc9104] experimental-build: Merge remote-tracking branch 'origin/master' into experimental-build

[Thomas Dinges]

Commit: dbc9104652158690b36cd9f8dbf5aae23e33afd8
Author: Thomas Dinges
Date:   Thu Jun 16 14:15:47 2016 +0200
Branches: experimental-build
https://developer.blender.org/rBdbc9104652158690b36cd9f8dbf5aae23e33afd8

Merge remote-tracking branch 'origin/master' into experimental-build

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



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