fix #660
Merge branch 'dev' of github.com:gogits/gogs into dev