Merge pull request #1738 from rolfbjarne/dublin-1916-dst