v0.18.0
Merge branch 'master' into export-utils-types
Trim trailing white space throughout the project