Merge pull request #2284 from ey6es/master

Xcode/GCC warning fixes.