Merge pull request #471 from nelenkov/master

preparing for maintenance release