Added support for doing a dry run
Added tag 9.5 for changeset b4619c9a48f3