Merge remote-tracking branch 'origin'

Merge remote-tracking branch 'origin'

Conflicts:
code/C4DImporter.cpp
code/OgreImporter.h