synced with upstream's version 0.12#1

georgesk merged 2 commits intogeorgesk:mastergeorgesk/Turing:masterfrom

TuringApp:masterTuringApp/Turing:masterCopy head branch name to clipboard