Merge commit 'remotes/gitorious/master'