Subtree root nodes weren't being labelled correctly.
Merge remote-tracking branch 'upstream/master'