Merge branch 'fix-replace-ofxUI' into develop