Merge branch 'emoji-pack-json-pretty' into 'develop'