Fall back to ArrowNode when arrowhead is small
Merge remote-tracking branch 'origin/master'