Pull updates from upstream, 20140425.