Merge branch 'issue_4048' into release-0.14 release-0.14
authorChristos KK Loverdos <loverdos@gmail.com>
Fri, 21 Jun 2013 12:24:05 +0000 (15:24 +0300)
committerChristos KK Loverdos <loverdos@gmail.com>
Fri, 21 Jun 2013 12:24:05 +0000 (15:24 +0300)
Refs #4048


Trivial merge