Fixes #114 (Same error, another location)
Merge branch 'master' into 2.0