Sync with upstream, 20140707