Changes made by Dragon Telerikov (the.dragon.telerikov@gmail.com).
Merge commit 'eccbefa5286bf7964842c7a271e9d65e4cb9b131' into AsyaBranch