Merge Google's v1.4 source release