Re-instate AssemblyVersion and AssemblyFileVersion
Update changelog
Bump version
Merge branch 'release/0.9.4' into develop

* release/0.9.4:
  Bump version
  Update changelog