Merge commit 'd8c4e7c1bd29921c2b24703d264669b9c711bae9' into STML1_Fix
authorTom de Boer <tom@tomdeboer.nl>
Mon, 9 May 2016 08:51:15 +0000 (10:51 +0200)
committerTom de Boer <tom@tomdeboer.nl>
Mon, 9 May 2016 08:51:15 +0000 (10:51 +0200)

Trivial merge