Added tag 0.9-4 for changeset a80b5195f5e7382c71b99c0ccd93f9b15dadeaf5