Bug fixes for 2.1 release
Merge branch 'master' into epydoc
G
Bug fixes for 2.1 Release (1-22-14)