change head to trunk
Merge pull request #593 from ifilippov/testing

change head to trunk