Merge "Fix texture manager crash" into devel/master