fix gh-498
Merge remote-tracking branch 'origin/master' into fix-gh-498
Merge branch 'fix-gh-498'