6.x-2.1
41e0b62d · Sink HEAD to github master's 6.x-2.1. Contains fixes for when changing node... ·