tree eee7118f3527f0cfd00f77d87f1cf5df8ef9142e
parent 63ce4cf1f5773639d4182a9493a7f51afd22ff47
parent 93541e494e1e6336b01e7feebbe0875c624fc86f
author Bill Hollings <bill.hollings@brenwill.com> 1535836953 -0400
committer Bill Hollings <bill.hollings@brenwill.com> 1535836953 -0400

Merge and fix conflicts between extension enhancement commits.