Issue #996 - Reduce build size to overcome build problem
Merge pull request #1001 from pecko/issue996

Issue #996 - Reduce build size to overcome build problem
Merge branch 'master' into issue984_NE