Merge branch 'issue_4140' into hotfix-0.14.2
authorChristos KK Loverdos <loverdos@gmail.com>
Thu, 18 Jul 2013 16:18:12 +0000 (19:18 +0300)
committerChristos KK Loverdos <loverdos@gmail.com>
Thu, 18 Jul 2013 16:18:12 +0000 (19:18 +0300)
Refs #4140


Trivial merge