Milestone 1.4#39

heho wants to merge 2 commits intomainmindscreen/baat:mainfrom

milestone-1.4mindscreen/baat:milestone-1.4Copy head branch name to clipboard