manually re-merge with upstream/master