updated for 2.6.2-ALPHA1
Merge pull request #634 from nelenkov/dev

updated for 2.6.2-ALPHA1