[Bf-blender-cvs] [c95a750] new-filebrowser-preview-temp: Merge branch 'master' into new-filebrowser-preview-temp

[Bastien Montagne]

Commit: c95a750a966fda2f7ca5f7de32817a7885eccb12
Author: Bastien Montagne
Date:   Thu Oct 8 15:32:32 2015 +0200
Branches: new-filebrowser-preview-temp
https://developer.blender.org/rBc95a750a966fda2f7ca5f7de32817a7885eccb12

Merge branch 'master' into new-filebrowser-preview-temp

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



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