Upstream update

@dpavlin please merge.