Merge branch 'master' into develope
Backup:Bug fix in upvote
Merge branch 'develope'