Merge commit '7b45d40fbc55b5d966048c63c7f4746f15b634f2' into dimilar
Merge remote-tracking branch 'github-libmv/master' into blender-libmv