merge mockup
Merge remote-tracking branch 'cedricpinson/develop' into develop
Texture onerror promise fix.