Manually merged changes https://github.com/perlundq/yajsync/commit/ec4fd69c02a4693e4cafae3df2e447caa9fcd12f and https://github.com/perlundq/yajsync/commit/7fe4da9247b44bd121c7a3a47373f8371d368da3