Fixed NPE when updating
bump version 9
Merge  branch release-1.1' into develop