Merge pull request #1364 from ey6es/master

Fix for obnoxious C++0x warning in GCC.