Release 3.18.0
Merge pull request #2 from jrob119/3180

Release 3.18.0