Merge remote-tracking branch 'origin/svn' commit 96bb7ef9cbe42d82eb58306 40/40/1
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Thu, 25 Aug 2016 06:50:46 +0000 (09:50 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Thu, 25 Aug 2016 06:50:46 +0000 (09:50 +0300)
Change-Id: I71a8c4265d3db8b6bdce94bab7e6eafd543081f9


Trivial merge