Blender Git Loki

Merge remote-tracking branch 'origin/master' into multiview

Conflicts:
source/blender/blenkernel/intern/image.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_image_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_render.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c