Merge pull request #1674 from ey6es/master

Fix OS X warning.