Merge pull request #105 from nps-tug/dev

Reviewed by TPO for release
Merge pull request #112 from nps-tug/dev

Merge v1.5 dev into master for release