Merge "Fix texture upload max buffer size" into devel/master