Merge branch 'github_matser'
Merge remote-tracking branch 'gitorious/master'