[Bf-blender-cvs] [50f413f] temp_localview_split: Merge branch 'master' into temp_localview_split

[Julian Eisel]

Commit: 50f413fca1209799661f033be39f253ed4134d1e
Author: Julian Eisel
Date:   Tue Aug 9 04:38:49 2016 +0200
Branches: temp_localview_split
https://developer.blender.org/rB50f413fca1209799661f033be39f253ed4134d1e

Merge branch 'master' into temp_localview_split

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



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