Upstream update to powerline