small fix
Merge branch 'master' into dev
#1300 tmp
#1300
#1217
#1217
closed #1309
#1281
#1281
closed #1322
closed #1322
closed #1323
closed #1321
1271
1272
Merge branch 'master' of https://github.com/yupe/yupe