Merged svn branch 20/20/1
authorHannu Niemistö <hannu.niemisto@semantum.fi>
Mon, 15 Aug 2016 12:21:53 +0000 (15:21 +0300)
committerHannu Niemistö <hannu.niemisto@semantum.fi>
Mon, 15 Aug 2016 12:21:53 +0000 (15:21 +0300)
Change-Id: Ia5151ea9c804ac3af3621ba472dfd91978945161


Trivial merge