Merge branch 'zouap_static' of https