Builds OK on local.
Merge pull request #1220 from xschildw/develop

Builds OK on local.