Merge branch 'issue_4677' into develop
authorChristos KK Loverdos <loverdos@gmail.com>
Wed, 4 Dec 2013 14:38:52 +0000 (16:38 +0200)
committerChristos KK Loverdos <loverdos@gmail.com>
Wed, 4 Dec 2013 14:38:52 +0000 (16:38 +0200)
Refs #4677


Trivial merge