Blender Git Loki

Merge branch 'master' into uuid-undo-experiments

Conflicts:
source/blender/blenloader/intern/readfile.c

Not really a merge, accepting changes from master and loosing most of
recently added debug prints here... Not a big deal, those are easy to
add back once needed.