Merge commit '55ca14c'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Tue, 4 Oct 2016 20:11:38 +0000 (23:11 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Tue, 4 Oct 2016 20:11:38 +0000 (23:11 +0300)

Trivial merge