Merge branch 'master' of /home/kudiaborm/PycharmProjects/emaya with conflicts.
(cherry picked from commit d6ab3f1)