Merge remote-tracking branch 'origin/svn' 19/19/1
authorHannu Niemistö <hannu.niemisto@semantum.fi>
Mon, 15 Aug 2016 11:19:15 +0000 (14:19 +0300)
committerHannu Niemistö <hannu.niemisto@semantum.fi>
Mon, 15 Aug 2016 11:19:15 +0000 (14:19 +0300)
Change-Id: I478743179fe637965255b3ed1d7d03c0fc0c54ab


Trivial merge