added support for devel branch and future 0.6.5 release
Merge branch 'devel-support'
0.2.20