#1630
#1630
Merge branch '0.8' of https://github.com/yupe/yupe into 0.8