Parse error, grrh

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #2591 from live627/release-2.1

Parse error, grrh