merge 16951:17122
[blender-staging.git] / release / VERSION
1 2.48