Merging from the trunk (http port used for tests).