Ensure i is set to -1, to stop thaw. version #
Merge branch 'master' into gh-pages