Blender Git Loki

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

Note: this also includes some house-keeping in the image_buttons.c to
handle the recent changes in the file.

Conflicts:
release/datafiles/locale
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_image/image_buttons.c