Blender Git Loki

Merge branch 'master' into multiview

Conflicts:
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/ocean.c
source/blender/blenkernel/intern/writeavi.c
source/blender/compositor/operations/COM_OutputFileOperation.cpp
source/blender/editors/object/object_bake_api.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/screendump.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/render/intern/source/pipeline.c