Fix #229
Merge branch 'master' of github.com:gogits/gogs into dev