(cherry picked from commit 892b6509) # Conflicts: # .gitignore # maphis/custom_graphics_view.py # requirements.txt # setup.py