Backport of the version 1.9.5 into the Gotham tree
Merge pull request #365 from dvblogic/gotham

Backport of the version 1.9.5 into the Gotham tree