Update distribution branch with latest code from master. #359

Closed klondikemarlen closed 6 years ago