Merge branch 'release-15.2.21' ECL.15.2.21
authorDaniel Kochmański <dkochmanski@gmail.com>
Sat, 21 Feb 2015 20:08:10 +0000 (21:08 +0100)
committerDaniel Kochmański <dkochmanski@gmail.com>
Sat, 21 Feb 2015 20:08:10 +0000 (21:08 +0100)

Trivial merge