Blender Git Loki

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

Way too many conflicts this time, and the last merge was less than 10
days ago! Sequencer was what changed the most (the proxy commits in
master) but I think the changes are all good in multiview now (I haven't
tested them, but the code seems fine).

Conflicts:
intern/cycles/blender/blender_camera.cpp
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/BKE_writeavi.h
source/blender/blenkernel/BKE_writeffmpeg.h
source/blender/blenkernel/BKE_writeframeserver.h
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/writeavi.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenkernel/intern/writeframeserver.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/screendump.c
source/blender/imbuf/intern/indexer.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/quicktime/apple/qtkit_export.m
source/blender/quicktime/quicktime_export.h
source/blender/render/intern/source/external_engine.c
source/blender/render/intern/source/pipeline.c