Changes On Branch trunk

Changes In Branch trunk Excluding Merge-Ins

This is equivalent to a diff from 3115f53525 to 3115f53525

2017-10-26
20:07
Re-added this code accidentally removed in the last commit Leaf check-in: 3115f53525 user: rkeene tags: trunk
20:06
Stubbed out more functionality check-in: 0c6ea4c365 user: rkeene tags: trunk