initial commit
2.5 complete
2.5 complete and merged
Merge branch 'master' into gh-pages
completed 2.8