Fix #447
Merge branch 'develop' into Xcode5Support

* develop:
  Fix #447