Blender Git Loki

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_transform.h
source/blender/editors/interface/resources.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/transform/transform_manipulator.c
source/blender/gpu/intern/gpu_buffers.c