Merge branch 'for-nicolas-smooth-reloading' into GLES2-AnchorCenter