GORA-245-v6.1

git-svn-id: https://svn.apache.org/repos/asf/gora/branches/GORA_94@1574715 13f79535-47bb-0310-9956-ffa450edef68