Fixes #1068 Upgrade 1.6.14 to 1.8 Beta 3 errors
Merge pull request #1069 from PaulBender/fix-1068

Fixes #1068 Upgrade 1.6.14 to 1.8 Beta 3 errors