#15 SVN change log error when working with a project with /trunk
Merge branch '2.0.0-beta-3'