#1274
#1274
#1274
Merge branch 'master' of https://github.com/yupe/yupe
#1274