update resulting from merge with upstream/master