[DF-532] Fixed compilation on MacOS 10.6
Merge branch 'development' into exttools-merge-particleeditor