fixes 101companies/101wiki#241
Merge branch 'master' of https://github.com/101companies/101rails