Xcode updates by Wolftrak.

fixes ticket:4265
Merge branch 'bugfixes'