Merge of v2.063.2
Merge pull request #418 from redstar/merge-2.063.2

Merge of v2.063.2