Include latest changes from powerline into powerline-plain