#1578
#1715
Merge branch 'dev' of https://github.com/yupe/yupe into dev