Merge branch 'hotfix/01.03.02'
add geoip fixture
Merge branch 'hotfix/01.03.03' into develop