Merge commit 'fd452722e97db9cf876f4f03a9e44fe750625a92'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 16 Sep 2016 10:47:30 +0000 (13:47 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 16 Sep 2016 10:47:30 +0000 (13:47 +0300)

Trivial merge