updated for 2.6.2 release
Merge pull request #639 from nelenkov/dev

updated for 2.6.2 release