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

Trivial merge