Merge pull request #803 from tombsar/master

GRIM: Syntax error when compiling with C++11 enabled