#1546
Merge branch '0.8' of http://github.com/yupe/yupe into 0.8
#1546 #831