Merger from gitorious.org