Merge "Fix glTF loading issue." into devel/master