Merge branch 'release/3.13' attic/tags/cdmlib/3.13/24840
authorjenkins <jenkins@160.45.63.201>
Wed, 15 Jul 2015 09:38:57 +0000 (11:38 +0200)
committerjenkins <jenkins@160.45.63.201>
Wed, 15 Jul 2015 09:38:57 +0000 (11:38 +0200)

Trivial merge