I'll have limited Internet access for the upcoming days and I cannot test my git
subtree patch.

Can someone test it and merge?  Thanks!