fixjoy
Merge branch 'fixjoy'