Prepare for painting object reintegration
Merge branch 'develop' of https://github.com/open-steam/webarena into develop