strip white space from adhocmodel fields.
Merge branch 'develop'