Merge pull request #2282 from TDT-AG/pr/20181114-luci-base