Bumping version to 1.6.4
Merge branch 'release-1.6.4' into develop

* release-1.6.4:
  Bumping version to 1.6.4