Python 2 compatibility (merges)