merge
Merge branch 'dev' into 0.8
Merge branch '0.8' of https://github.com/yupe/yupe into 0.8
closed #1526