Merging from branch (rev 22)
Merging most recent revisions (up to rev 30) from branch to trunk
Merge branch 'master' into dev_branch