Updated plugins. Removed the tabstop merge that 010c2940ce8847ec8a14b0755574cba64f26ae7f introduced