[pull] master from botpress:master#396

pull[bot] merged 2 commits into

code:mastercode/app-botpress:masterfrom

botpress:masterbotpress/botpress:masterCopy head branch name to clipboard