Merge pull request #881 from tobiasd/20190828-ja