Merge from the latest version of zynga